Skip to content

fmt: Ran cargo +nightly fmt --all after new nightly release. - #10081

Open
genericusername2709 wants to merge 2 commits into
jj-vcs:mainfrom
genericusername2709:fmt
Open

fmt: Ran cargo +nightly fmt --all after new nightly release.#10081
genericusername2709 wants to merge 2 commits into
jj-vcs:mainfrom
genericusername2709:fmt

Conversation

@genericusername2709

@genericusername2709 genericusername2709 commented Aug 30, 2026

Copy link
Copy Markdown

Github actioncheck(rustfmt) failing after new nightly release

Ran the command cargo +nightly fmt --all to fix the format.

Checklist

If applicable:

  • I fully understand the code that I am submitting (what it does,
    how it works, how it's organized), including any code drafted by an LLM.

@genericusername2709
genericusername2709 requested a review from a team as a code owner August 30, 2026 02:46
@genericusername2709 genericusername2709 changed the title fmt: Ran cargo +nightly fmt --all after new nighly build release. fmt: Ran cargo +nightly fmt --all after new nightly release. Aug 30, 2026
josephlou5
josephlou5 reviewed Aug 30, 2026
View reviewed changes

@josephlou5 josephlou5 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do like it when formatters automatically wrap comments (yay clang-format) but this is such a (necessarily) big commit lol.

I've reviewed 42 files but will take a break here in case a maintainer wants to tell me to knock it off with the reflow requests and just submit the commit as-is.

Comment thread cli/src/merge_tools/builtin.rs Outdated
Comment thread cli/src/merge_tools/external.rs Outdated
Comment thread cli/src/cli_util.rs Outdated
Comment thread cli/src/cli_util.rs Outdated
Comment thread cli/src/cli_util.rs Outdated
Comment thread cli/src/cli_util.rs Outdated
Comment thread cli/src/cli_util.rs Outdated
Comment thread cli/src/cli_util.rs Outdated
Comment thread cli/src/cli_util.rs Outdated
Comment thread cli/src/cli_util.rs Outdated
josephlou5
josephlou5 reviewed Aug 30, 2026
View reviewed changes

@josephlou5 josephlou5 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

100/196

Comment thread cli/src/ui.rs Outdated
Comment thread cli/tests/test_config_command.rs Outdated
Comment thread cli/tests/test_git_push.rs Outdated
Comment thread cli/tests/test_op_revert_command.rs Outdated
Comment thread cli/tests/test_resolve_command.rs Outdated
@genericusername2709
genericusername2709 force-pushed the fmt branch 3 times, most recently from cf7f67c to 62be36e Compare August 30, 2026 04:55
josephlou5
josephlou5 reviewed Aug 30, 2026
View reviewed changes
Comment thread cli/tests/test_git_push.rs Outdated
@genericusername2709
genericusername2709 force-pushed the fmt branch 3 times, most recently from 48056ac to 431822a Compare August 30, 2026 09:44
@yuja

yuja commented Aug 30, 2026

Copy link
Copy Markdown
Contributor

Do you know if this rustfmt change is intentional? It might be better to disable wrap_comments, temporarily or permanently.

josephlou5
josephlou5 reviewed Aug 30, 2026
View reviewed changes
Comment thread cli/tests/test_git_push.rs Outdated
Comment thread lib/src/default_index/revset_engine.rs Outdated
Comment thread lib/src/default_index/revset_graph_iterator.rs Outdated
Comment thread lib/src/diff_presentation/mod.rs Outdated
Comment thread lib/src/lock/unix.rs Outdated
Comment thread lib/src/local_working_copy.rs Outdated
Comment thread lib/src/local_working_copy.rs Outdated
Comment thread lib/src/local_working_copy.rs
Comment thread lib/src/local_working_copy.rs Outdated
Comment thread lib/src/local_working_copy.rs
@josephlou5

josephlou5 commented Aug 30, 2026

Copy link
Copy Markdown
Contributor

Do you know if this rustfmt change is intentional? It might be better to disable wrap_comments, temporarily or permanently.

I know this is still a nightly feature but it's kind of ridiculous how inconsistently it behaves. I've reviewed 150 files and still can't figure out why sometimes it breaks lines weirdly and doesn't fill out to 80 columns. Maybe disabling the option would be better...

@genericusername2709

genericusername2709 commented Aug 30, 2026

Copy link
Copy Markdown
Author

It is a reported bug in rustfmt: rust-lang/rustfmt#5890

josephlou5
josephlou5 reviewed Aug 30, 2026
View reviewed changes
Comment thread lib/src/git.rs Outdated
Comment thread lib/src/git_backend.rs Outdated
@josephlou5

josephlou5 commented Aug 30, 2026

Copy link
Copy Markdown
Contributor

It is a reported bug in rustfmt: rust-lang/rustfmt#5890

That doesn't seem related; that issue is talking about multi-line block comments using /* */, but none of the problematic comments are using that comment style.

@genericusername2709
genericusername2709 force-pushed the fmt branch 2 times, most recently from 0251a6b to 6619cf4 Compare August 30, 2026 15:49
@bobrippling bobrippling mentioned this pull request Aug 30, 2026
Open
6 tasks
josephlou5
josephlou5 reviewed Aug 30, 2026
View reviewed changes

@josephlou5 josephlou5 left a comment •
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note: lib/src/rewrite.rs had reformatted code as well (if let statement was wrapped differently, which changed indentation for a whole block). I checked it closely but more eyes are always good.

Also, I've now reviewed 196/196 files.

Comment thread lib/src/repo.rs Outdated
Comment thread lib/src/repo.rs Outdated
Comment thread lib/src/repo.rs Outdated
Comment thread lib/src/repo.rs
Comment thread lib/src/repo.rs Outdated
Comment thread lib/src/rewrite.rs Outdated
Comment thread lib/src/rewrite.rs Outdated
Comment thread lib/src/rewrite.rs Outdated
Comment thread lib/src/workspace.rs Outdated
Comment thread lib/tests/test_git.rs Outdated
@yuja

yuja commented Aug 30, 2026

Copy link
Copy Markdown
Contributor

Looks like the comment width is now calculated including indents, but I haven't double-checked.

@josephlou5 josephlou5 mentioned this pull request Aug 31, 2026
Open
6 tasks
@yuja yuja mentioned this pull request Aug 31, 2026
Merged
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@josephlou5 josephlou5 josephlou5 left review comments

At least 1 approving review is required to merge this pull request.

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@genericusername2709 @yuja @josephlou5